changed lots of things, will document in a little, I just want it in version control now