Finally got all the kinks out