Re-factored how screenshots worked