Cleaned up field mess and added back Resource listener
Moved methods around