Static methods was a bad idea -- also changed some methods to properties