Stuff

Refactoring, fixing. Also failed attempt with stencil drawing.