fixed bug where data repeated itself, needed a break in a case. also finished basic version