Eighteenth Commit

Fixed up more broken bricks.