Updated logic and started getting plugin ready for the WP Plugin Repo.