wip on toa and fct 2d
Merge pull request #63 from trontrytel/master

pull me