Continued work on layers.