Began implementation of basic watermarks