Nuevos modelos, refactor is over 9000 babezzzz