more stuff
now kind of works