Working out some kinks;