Work on timing, etc.
3 files changed