Starting to work kinks out