General Update

- Added Confirmation Message
- Cleaned up code to be less mushed together.