tidy
wip and .gitignore