Major changes

 towards figuring out how it works