Expand on Djupdal's design
Expand on Aamodt's additions