removed poor data implementation. Cleaned up both classes