Work in progress

Do some more stuff here.