moved some stuff around, finally decided what to do with layers