Small state-persistance improvement in Controller
Created almost all functionality for file upload