Now that bug is really fixed, have to clean up a lot of that entity stuff later but this way it's working