work on incorporating aggregate mask + some clean up