Add basic tags support, some unit tests and get tags to show on the other side