BelongsTo cleanup
Find bugs, implemented belongsTo and hasMany