Added initial structure and test code