Refactor parsing, continue work on Tag object