Moved Class as requested by todo and added some comments