Getting up to speed

Lots of changes