Requirement 1 & 2 Done