More architecture and all of future work