Committing this because it's a WIP, there's still something very wrong.