Alpha 1

merging first