Initial Commit for 1.7.10. Fixed several bugs. This is not all the classes or code. Will be commiting after a final clean up