refactored store, added aim addition and removal feature