More debugging

- Getting close