1/2/13_a

Finished refactor Manual classes