Cleanup. Flesh out.