Added remainder of helper classes. Compiles.