Update the TAC interface for milestone 3
Merge branch 'master' into tac_ms3