Pre alpha two

too big of a branch. merging in all of these so I can start working with sane branching/features now that it's less ground-work.