Still Working on This

- Added more stuff
- Need more time to finish