final version - without dropbox/drive functionality