First stab at adding new features to Pi version