SWE-143 - Software Architecture Review