Updated versions of the new classes I was working on