More work on initial implementation