let me know when you are done, i'll merge your changes and then I'll change the logic of that piece a little bit