Cleaned up some code.
Merge branch 'prototype' into prototype-tache