Almost done!!

Everything done except error handling and update UI automaticly..