File upload bug. Committing latest files to fix later