Finish up last use case
Went a different direction, do not need these anymore