Refactoring / Add comments
add use statement
Change regex (accept rql params)
Refactor listeners to use actions