todo: started porting todo items over