Ver. 0.2a Merge

Probably going to merge changes tonight.