started adding folder and user functionality