Begin some re-factoring<br />Improvements to the watermarker class (now namespaced)<br />Clean up the admin panel