Finished removing the use of "helpers" and now using "system"