more stuff working!