Implemented fields. Cleaned up a bit. Testing almost ready