Shiny shacfleet.org, Initial Code Merge