Removed commented out code, ughh.