Added some TODO in comments as a simple issue tracker ;)