First changes to add one instruction page per functionality #119