Moving everything to RAILS
Fixing merge