phase ii

tested + appears functional