Initial checkin of what's been done so far