New implementation of TODO idea
misc wibble