Updates todo.
Adds todo note.
Refactors code.
Updates couple of parser methods.
Adds parser tests.
Build: includes parser tests.