Works from scratch to rack
Merge branch 'rails'