Work in progress to remove hard-coded numbers