Starting some more tests, revamping controller output.