initial commit
had to merge because of changes online
Lots of tweaks and changes, probably need to spell check this thing