Calendar methods, add archers separately, new mockData

Change-Id: Ife2dcef7685c3c426740d69bf4ca3edd7abb7232