"May actually be able to survive this" commit. Added view updates and
other transitional items