PJ's big changes

It works now