-wip non functional

lots of changes!