#3 Starting to merge two repositories to share the code