Missing commits from last time to exercise and

start