New branch with layer2.py instead of layer.py