Didn't end up needing System after all