Ignore even more
Merge branch 'dev'
Initial refactoring