undoing part of funky merge.  Move to Layer init to new model.