Added functionallity back in, uploader still broken