Working on getting showcase modularized