Broke everything, but got the type aliases working, just hit it until it compiles from here