big mama server refactoring - less bugs