Need to include extras in setup to accomodate future windows extras modules