Create master

it's a mess right now, because I've developed everything more or less by itsself and merged em, which was messy.  Part of what i could use a pointer on is organization.