more work - rerewrite soon

rewriting code again tomorrow