Did some more work on the Layer class