Tons of updates to main file