Finished adding action/table listeners
Created KeyValuePair class for future use