This is all done, only nit pickity stuff left.  Need to add comments in code and work on code structure in files, apart from that it is all good