Many changes, this is almost derbycon ready