Starting to clean up the $. Maybe need better name and more robust code.