Initial design and test code