Begin implementing new architecture