TODO update/comments/remove support
git stuff