Fixes #4 (TODOs)