Tried stuff in main.rb
Fixed merge isses
Changed to main.rb