Adding trap and working on interrupt layout