More work on the actual implementation