add tagging options and start writing integration tests.