yay more stuff working!