Update repo with new code

Long overdue