Adding testing code and initial layout