Alpha-2

Still doesn't work, but at least is structured right and should have all
dependencies.