Finished some stuff, half way through commenting