Done with basic functionality.
Rest of stuff.
Merge branch 'herp'