diff --git a/bam.lua b/bam.lua
index 82ebed9..8807518 100644
--- a/bam.lua
+++ b/bam.lua
@@ -3,6 +3,7 @@
 --    Spectre build config    --
 --                            --
 --------------------------------
+Import(".bam/utils.lua")
 Import(".bam/functions.lua")
 CheckVersion("0.5")
 
@@ -12,9 +13,10 @@ CheckVersion("0.5")
 --                            --
 --------------------------------
 
--- OS Detection
-TARGET_OS = system()
-if TARGET_OS == nil then
+-- Target specified on command line or get host system.
+TARGET_OS = ScriptArgs.target or system()
+
+if not valid_system(TARGET_OS) then
 	print ("System not supported" )
 	print ("Supported systems are: " .. supported_systems() )
 	return 1