consolidate classes
added force fields