0.0.69.8

Finished refractoring existing methods.