lots of changes, as i was not sure of this projects success, i didnt git push often enough, of wrote tests for this, this will al be in the todo