backup, cleaning up next commit

"New" funcionalities. more efficient code and a lot o garbage in this
commit :P