WIP rails 4 -> 4.1