Added spec to start refactor