Cleaned up everything, added height data member and tried to prevent all pass by ref errors