Progress made - some more major changes to do

To: show only my own exercise and beer