created new model Asset
migration to change userid to user_id
established relationships between user and asset
finally implemented user-specific viewing of assets
merged master and assets