Finish initial architecture design