Fixed callback issues, started fixing relationship