ALH: Finish #6 make it modular