Might make more sense if I made the comment on the latest commit :stuck_out_tongue: 

Could *this* be handled by the protected decorator?