Design tweaks, get working end-to-end