Initial code review of current code base

same again - should be a method being overridden rather than a member