Slight Refactor and checkout to pre-Box Branch