December major update + full refactoring