Added HMAC check. WIP