Added todo
Split into two files and also display on info page