Beginning to fix things