core data added
- still not implemented all logic