wip homes and captures as arrays ...

Not a bit change but maybe easier to use.
This is WIP and might not compile.