included all import statements and rewrote the classes so they work with each other.