Needs more work.
Added switch for checking architecture.