New branch for messy changes
Added Tags support.