Rails3

this time for real, even with tests...