This is a definite code smell - I think we need to think about this one