Tagged and refactored my parts in com