Updates for Ben

This version is very unstable. Please give me a couple of days before
using.