Started to include old, refactored code