Ignore todo
Refactored code and specs to make room for more advanced features