First Commit

First Try
SMALL FIX