I'd like to get traceur on the server side code to clean this up more...