working out the kinks of complete code rewrite
refactored version working, demo working
got rid of old files not needed anymore