Dryed up views, add start and end to wiggle, updated tests