worked on some more code