Major commit for Alpha 2.0a. Closes commits #7 and #10