Moved a lot of stuff + added meter predicates