Major Overhaul

Changed and added new functions and features.