refactor section to support deck builder