should remember to commit more often, this is a working version... need to clean up popup a bit... little testing