Shift where the keys are grabbed from
Community page finished - Infrastructure proj refactored