Feature/rails way

Rails way, as said