Made progress on declaring variables inside functions, still getting shift/reduce so commented out
Cleaned up files a bit, removed accidentally included test batch