Alpha phase

Not working yet, but most of the ideas are down.