Added basic assignment
Added basic assignment
bringing in changes to master
on the right track?