Revert 26c61cb..cc05964

This rolls back to commit 26c61cb2eb69c17f9eeffe3e1bb6781da2307892.
Fixed all the DB issues and completed the first task of the friend model