I like the comment idea! About the separate class, we should see how much is left behind in the original app. If it's not much I'd be pro on keeping them in the sam file.