rails 3 WIP

- maybe done, but need more testing