Using stores all the way and separating definitions even more