first three blocks working
Merge pull request #4 from MattFlaig/s6

first three blocks working