Integrates add answer, some cleanup.
Merged.