Added code for other functionality and some startup tests.