Alpha 1.0

Combined All work so far
Revert 5ad1424..1f7dc6e

This rolls back to commit 5ad14243135ef860760a9e8a6701fb76db711ec0.