Fixed scene definitions. On to bigger and better things