plans, new functions. Going to delete a whole bunch now