20140515 Work

Never really did anything on the "Before Maintoolbar Overhall" commit