More Barrel Updates - Unfinished

These are unfinished, so it will/should not compile and run. I am
merely making a commit so that I can transfer files between computers.