new branch that contains a lot of nice things

code is complete andready/