GH #325 - Added todo markers on what to work on next.