Added a whole bunch of new fancy features!!!