Adding junior and modifying tests to make pass, modifying bundle to only include framework code