Argh...can't wait until the refactoring @crosbymichael mentioned to have the fs handle this :)