Alpha

Finished Alpha, Merging with Master before starting Beta