WIP checkin of expander module