There is still a major bug, but this is a big change