Splitting out hhvm stuff