Tc prototyping

Merging the work I have done and tested with Master so you can pull from Master on Saturday instead of my branch.

There was no conflicts doing this merge, so there should be no problems at all.
Let me know if there are of course :)