90% complete, fixing photo upload and events display