Ben's changes

uploading ben's commits because github kicked him out of the room for
whatever reason