Started adding architecture detection

Didn't get around to testing the UA for the architecture yet, will
probably do it tonight sometime