Updated my setup. Still a work in progress