almost done pulling out alias class