DONE! Primary features now work.
Merge remote-tracking branch 'origin/master'