Started on integrating spawn system