Added section selector and started to write out the handlers