Did a TODO; almost fixed stuff
CurrentInputLineIndex is now a "real" property