More work on fleshing out the system