HDW alpha just for review purposes

Not for merge yet, just for commenting and review.