Tc labwork

Time to pull chages into master :)