Got more stuff working