Add Controller additions, clean up