Initial checkin of working module