mostly done ... needs some user feedback and admin rules and testing