check for swipes
removed failed enum experiment
Refactored to new packages