Major refactoring of views.py lost after ubuntu freeze, will commit more often then...