Aaand, more work on 1.7 update.
Damn rails are hard to do, anyone got any ideas?