fix pa year and break out into two unit lists, add pa status to unit model