Some progress on Architecture Document (not finalised yet)