Rails4

Still working on rails 3