WIP: more stuff is starting to work :)