Fixes #8 - removes TODOs from code