Cleaned up scaffold
Added pins/users association