Added some initial code, testing.