Initial checkin of workable version