deleted references to fieldmanager class
began refactoring code base and updated unit tests