lots of dev done. need to redo everything though!