nuevo main

refactoreo + needs redraw

TODO refactoreo