saving some more work, things currently broken, will fix in future