Normalized newlines between code blocks
Added the create a taking feature

See TODOs
Merge remote-tracking branch 'origin/PouleRequestTesting' into dev