WIP removing warnings
update todo list