fixed the code with Nathan

working app now ready for test frameworks.