removed junit tests for today, add a new better structure tomorrow2