started with result handler; added a bunch of todos