Work in progress...
New ideas implemented - parsing TODO