Everything runs, tests passing comes soon
did some work on target functions