Biiiig refactor