Started work on testing. Sort of.