Tp sprint 3

Numerous features wrapped up into a single pull request (i tried to specify the feature in the commit messages)