Working locally now
Working locally now and syntax clean up