pull from macbook
pull from macbook
fix merge bug
add UI for variable input and testing