Added tagging ability and started unit testing
Tests added and tags make better