First commit Tuesday april 03 - working 70% - still needs improvements