minor changes
Most of the code done, runtime errors though