phase i

tested + appears functional