Passing the tests, but I really need to fix that vApp thing once and for all