-done- Refactor to function
-done- + comments