Worked out some kinks