Version 2 IS DONE!

this should be everything for v2!
going to fix a few bugs monday, but this is ready to play test!!!!