WIP with the architecture in place
WIP