March 7 Commit

Completed pretty much all features.