Some fleshing out

Lots still to do, this is far from functional