cleaned up engineering and linked to stackmates