Finished up str to not be a stopgap