Trait classes filled out.
Temporary agent creation. AgentHandler fixed.
Testing changes.
Merge remote-tracking branch 'origin/master'