Merge Initial Development

Didn't want to do initial development off of master. I'm OK with merging this in with master.