Moving some things around. Playing with some ideas