Continue on stack an major refactores