Modularity and Optimization
Code Cleanup
Began implementing custom popups