Imported all the basic stuff... ready to clean up and start writing tests.