Just minor work on getting the shit working