not sure what I changed here, but some more stuff working.