Added a lot of audit stuff and some testing