Initial checkin of non-working dev version