removed a bunch of promisey code; converted to callbacks