Initial commit of WIP t&a code