WIP - well atleast it runs again