Transport refactoring
Role feature announcement - close #15
Tests and temporary fix for #53
Commented out the wrong thing.