Progress

Added main js functionality