First attempt at checkpoint
Added auto layout