Added some basic TODOs to modernise this ancient code