Update round two

Whole bunch of new features