Builds on desktop, trying to avoid excel_to_code on server
Merged