Finished re-factoring hAzzle