Initial Commit

with some bugs !