Continuing work on main plugin file