Uncommited changes from hack weekend.