re-added stuff

Still getting used to the git system, so bah.