Refactor & removal of prealpha things
Implemented belongsTo relation mapping