Started coding generic Golem classes, ignoring conflicts with vanilla code for now