Re-Wrote the entire system