Removed todo items from code. Closes #6.