Mods to make simple testing work
added package
removed code i never impl.
removed name conflicts