work in progress - fixed syntax errors