Merging Current Alpha 3 state over Main

The current Alpha 3 stage appears to be stable enough with only some minor issues to still be worked on before completion. Due to changes between Alpha 2 and Alpha 3. I'm going to just go ahead and merge the current state