Did stuff. Pushing to use as the base for the blip project