Lots of stuff in one commit, but i am alone at this stage anyways. Kinda works now.