Sorry about all the crazy pushes, had some errors to work out