distratctions win
Merge branch 'master' into tmyrden/views
Making things work