Started implementing new architecture