Big refactoring, create engine on server