TODO: Refactor and fix bugs.
Merge branch 'readme/todo'