cleanup to generic vars, marking things as not implemented where appropriate
cleanup to generic vars, marking things as not implemented where appropriate

codethesaurus/codethesaur.us,codethesaurus/codethesaur.us