Working on fixing things