Overhaul because github is stupid