Fixing up things so it actually runs