Adding more stuff. Still broken