Some work actually implementing functionality, doesn't compile though
For now, marked sources as belonging to both targets, but ideally should move common code into a framework (this may be what is causing the compilation issues)