Did some work on all ends...