A few quick updates. Removed dependencies. Simple fields method.