Refactored Field classes
Fixed refactoring bugs

Finished restoring previous functionality