included all import statements

also rewrote the classes so they work with each other.