COMPLETE REDESIGN THE WHOLE SYSTEM!