Another WIP, breaks mosts tests:(