Arch

Rough plans, some partially implemented