Commit 14

Quase final