Still working out the kinks but getting better