Poetter

Moving in my changes into the main branch.