first commit - 90% to Alpha
merge