Attempt to fix collapse
Merge branch 'Jacob-Workspace' of https://github.com/Gaekub/pARC-Software-Prototype into Jacob-Workspace