I'm going to delete out the commented-out functions now...