First working version without any database storage