Worked on it a bit