Finished coding, perhaps test a few things