Base Architecture almost complete