Initial drop (from previous build of Santiago)

Signed-off-by: Santiago Sanchez Acevedo <koguiman@gmail.com>