First pass at adding responsiveness