Added top comments, updated UML
Merge remote-tracking branch 'origin/bryce'