[#68767642] [#68321420]

68767642 - trying out Blueprint for handling different modules.

68321420 - changed the logic as per yesterday's meeting.