Will most likely be tweaked later
-Closes #25