added discard target to make throwing away local changes easy
started cleaning up source - removed most commented out code lines