Started moving from strcuts to classes as to be more OO