First attempt at hardening build