WIP
Merge branch 'master' into testing
add the guard
first test
better test vars