Changed to alloy

Not a functional version. Committing so that James can take a look and
tell me why I suck.