Finishing the software subclass and took out the enum and did some other editing and corrections