Major refactoring. Also added slider needles