[BUGFIX] Implements prerun/postrun correctly (temporarily)

Feature will change in future, but include as is anyway