Working on making Toxy more feature rich