Committing these again beacuse
Replaced some blocks with scaffolding
Merge branch 'master' of github.com:ericslee/Magnet-Master-2