Some more changes, angular still isn't bootstrapped