Ran demo with Carl
Add MAC validations
Merge branches 'update-functions' and 'master'