Checking in working version. Yay.