All the main functionality has been added... now on to some tests.