Complete redesign. Testing.