Continued working on phase 2. TODO for phase 3. May need to add more fields.