Main getting fixed up more