Implement some of the missing todo 'silly' code