Update architectures with latests happy-plan (WIP). Ready to start serious things