Checkpoint #3

Now with more audit logging