HUGE RE-FACTORING

Refactored the entire app.  it's pretty sweet right now