more stuff is working I think