restructured a bit
tried angle delimited variables that work better with bash script templates