Alpha 2.0

Too many additions to count.