Bay organ branch

There's probably quite a bit wrong with this, will be going through it in more detail in a bit.