finished a todo
added a todo
finished a todo
Merge branch 'master' into nuc