Add a new feature or refactor

[mtpjr88]

I am pretty open to changes, just test to make sure it works before making a PR.