First pass at making everything more pip-friendly