Xcode user state

Imported files, linked settings controller properly now