+ merged New and Old Repo

closes #21, #6, #5, #8, #9