Major Overhaul

Got mostly everything working.