Worked on the implementation a little.