Entire Re-Write

Done :D