Adding build
Smarter local vars