Finished play (except testing)

Need to refactor tests