Separated out into milestone 0 checkout and other features.