Small refactor, now using actuall data