846a9b94c7
Also refactored the "base" template stuff - really should've done that in a separate commit
Also refactored the "base" template stuff - really should've done that in a separate commit