Rewrote systems, removed some functionality.