Working revision, not really making progress yet though