Fix merge conflicts

Combine my changes with Matt's work
Assets added