Simplification (atomicity isn't necessary here)
Added iPhone 6, removed unreliable disk-space function
New classes added