Changed my mind on the name again.

Also some initial work.