Need to work on it some more