Initial code review of current code base

Not keen on overriding members like this - would much prefer it if this was done through an overiden method instead, e.g.