Still doesn't compile, but it's closer