WIP: More work. Still not working