Removed old code, refactoring now
Removed Local card copy, need to go through and write new tests