Added basic functionality and store