Refactoring again , tried to get a working project ( half way there ) , so far fixed the removing and adding from / to store/card ...