Lots of stuff that still needs to be finished, will continue tomorrow