Walked throug the code review and have added comments to the header file and removed TODO's that might never bee done
and some minor name changes of struct/class