Ok.. it means a lot of refactoring probably :)