Added some cli output to deconstruct along removal of pointless line
added some more todo items