class overhaul
efficiency gain do_by_sims
commit before cleanup
some cleanups