Add todo and cleanup first set of code