Moved historical event to the correct place
Add debug function
Still need to work on the template