Refactored some things, implemented some missing steps, etc.
Modified seed of user Kayvan in the db to have a fake cid
Merge pull request #42 from TheArchitects/k1/iter3_fixes

Refactored some things, implemented some missing steps, etc.