More cleaning up implementation

Also fixed PExp Parents. Test now passes