major refactoring
more refactoring
refactoring done, I think
Merge branch 'development'