Still refactoring and reintegrate old stuff