Implementing tags
Fixed conflicts, cmon git