Implementing Hammy's Changes

Bringing the group repo up to speed with Hammy before transferring him to the group repo.