updated sections 11-12 and added tests for them
Merge FrontEnd
stashed changes
Merging conflicts