Tofe/work

Code still needed for reference or can be dropped?