Revert "Removed some excess code, cleaned up prompts"

This reverts commit afa729e088e0c69e0d935b3d77faa550c3188e41.