Feature/ajw add monitoring