1st working commit, lots to do still