more stuff. nearly works