Last few days of working and testing. Includes commented out code.