adding all of the goodies from the old repo