First WORKING VERISON
0.1.1
Cleanign up