More work on the leevel stuff