Fixed the last issue from the last push and did a little testing. There
are still some bugs to figure out with the predicate.