diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..b4d4623490
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submods/amrex"]
+	path = submods/amrex
+	url = https://github.com/AMReX-Codes/amrex.git
diff --git a/exec/GNUmakefile b/exec/GNUmakefile
index 818c084248..3ce77278f8 100644
--- a/exec/GNUmakefile
+++ b/exec/GNUmakefile
@@ -1,121 +1,10 @@
-
-# Parallelisation options
-USE_MPI = TRUE
-USE_OMP = FALSE
-
-# Debug mode?
-DEBUG = FALSE
-
-# Use HYPRE solver?
-USE_HYPRE = FALSE
-
-# Profiling
+COMP          = intel
+USE_MPI       = TRUE
+USE_OMP       = FALSE
+DEBUG         = FALSE
+USE_HYPRE     = FALSE
 PROFILE       = FALSE
 TINY_PROFILE  = FALSE
 
-
-
-########################################################################\
-# 																		#
-# Below are settings which we probably don't want to change very often. #
-# 																		#
-########################################################################/
-
-# Path to AMReX directory and incflo directories
-AMREX_HOME ?= ../../amrex
-TOP = ..
-HYPRE_DIR ?= ../../hypre/src/hypre
-
-# Use OS-friendly compiler
-UNAME := $(shell uname)
-ifeq ($(UNAME), Linux)
-	COMP = gnu
-else ifeq ($(UNAME), Darwin)
-	COMP = llvm
-endif
-
-# Non-verbose compilation
-VERBOSE = FALSE
-
-# Always use 3 dimensions for incflo
-DIM = 3
-
-EBASE     ?= incflo
-
-USE_MG        = TRUE
-USE_EB        = TRUE
-
-include $(AMREX_HOME)/Tools/GNUMake/Make.defs
-
-#These are the directories in incflo/src
-Bdirs 	:= src
-Bdirs 	+= src/boundary_conditions
-Bdirs 	+= src/convection
-Bdirs 	+= src/derive
-Bdirs 	+= src/diffusion
-Bdirs 	+= src/embedded_boundaries
-Bdirs 	+= src/projection
-Bdirs 	+= src/rheology
-Bdirs 	+= src/setup
-Bdirs 	+= src/utilities
-
-Bpack	+= $(foreach dir, $(Bdirs), $(TOP)/$(dir)/Make.package)
-Blocs	+= $(foreach dir, $(Bdirs), $(TOP)/$(dir))
-
-include $(Bpack)
-INCLUDE_LOCATIONS += $(Blocs)
-VPATH_LOCATIONS   += $(Blocs)
-
-#These are the directories in AMReX
-Pdirs   := Base AmrCore Boundary EB
-
-ifeq ($(USE_HYPRE), TRUE)
-Pdirs   += Extern/HYPRE
-endif
-
-Ppack	+= $(foreach dir, $(Pdirs), $(AMREX_HOME)/Src/$(dir)/Make.package)
-Plocs	+= $(foreach dir, $(Pdirs), $(AMREX_HOME)/Src/$(dir))
-
-include $(Ppack)
-INCLUDE_LOCATIONS += $(Plocs)
-VPATH_LOCATIONS   += $(Plocs)
-
-include $(AMREX_HOME)/Src/LinearSolvers/MLMG/Make.package
-INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/MLMG
-VPATH_LOCATIONS   += $(AMREX_HOME)/Src/LinearSolvers/MLMG
-
-include $(AMREX_HOME)/Src/LinearSolvers/Projections/Make.package
-INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/Projections
-VPATH_LOCATIONS   += $(AMREX_HOME)/Src/LinearSolvers/Projections
-
-all: $(executable)
-	$(SILENT) $(RM) AMReX_buildInfo.cpp
-	@echo SUCCESS
-
-# job_info support
-CEXE_sources += AMReX_buildInfo.cpp
-CEXE_headers += $(AMREX_HOME)/Tools/C_scripts/AMReX_buildInfo.H
-INCLUDE_LOCATIONS +=  $(AMREX_HOME)/Tools/C_scripts
-
-AMReX_buildInfo.cpp:
-	$(AMREX_HOME)/Tools/C_scripts/makebuildinfo_C.py \
-          --amrex_home "$(AMREX_HOME)" \
-          --COMP "$(COMP)" --COMP_VERSION "$(COMP_VERSION)" \
-          --CXX_comp_name "$(CXX)" --CXX_flags "$(CXXFLAGS) $(CPPFLAGS) $(includes)" \
-          --F_comp_name "$(F90)" --F_flags "$(F90FLAGS)" \
-          --link_flags "$(LDFLAGS)" --libraries "$(libraries)" \
-          --GIT "$(TOP) $(AMREX_HOME)"
-
-vpath %.c   . $(VPATH_LOCATIONS)
-vpath %.cpp . $(VPATH_LOCATIONS)
-vpath %.h   . $(VPATH_LOCATIONS)
-vpath %.H   . $(VPATH_LOCATIONS)
-vpath %.F   . $(VPATH_LOCATIONS)
-vpath %.f90 . $(VPATH_LOCATIONS)
-vpath %.f   . $(VPATH_LOCATIONS)
-vpath %.fi  . $(VPATH_LOCATIONS)
-
-include $(AMREX_HOME)/Tools/GNUMake/Make.rules
-
-clean::
-	$(SILENT) $(RM) AMReX_buildInfo.cpp
+INCFLO_HOME := ../
+include $(INCFLO_HOME)/make.incflo
diff --git a/make.incflo b/make.incflo
new file mode 100644
index 0000000000..a3a6518dcb
--- /dev/null
+++ b/make.incflo
@@ -0,0 +1,90 @@
+# Path to AMReX directory and incflo directories
+TOP = .
+AMREX_HOME ?= $(INCFLO_HOME)/submods/amrex
+HYPRE_DIR ?= $(INCFLO_HOME)/submods/hypre/src
+
+# Non-verbose compilation
+VERBOSE = FALSE
+
+# Always use 3 dimensions for incflo
+DIM = 3
+
+EBASE ?= incflo
+
+USE_MG = TRUE
+USE_EB = TRUE
+
+include $(AMREX_HOME)/Tools/GNUMake/Make.defs
+
+#These are the directories in incflo/src
+Bdirs := $(INCFLO_HOME)src
+Bdirs += $(INCFLO_HOME)src/boundary_conditions
+Bdirs += $(INCFLO_HOME)src/convection
+Bdirs += $(INCFLO_HOME)src/derive
+Bdirs += $(INCFLO_HOME)src/diffusion
+Bdirs += $(INCFLO_HOME)src/embedded_boundaries
+Bdirs += $(INCFLO_HOME)src/projection
+Bdirs += $(INCFLO_HOME)src/rheology
+Bdirs += $(INCFLO_HOME)src/setup
+Bdirs += $(INCFLO_HOME)src/utilities
+
+Bpack += $(foreach dir, $(Bdirs), $(TOP)/$(dir)/Make.package)
+Blocs += $(foreach dir, $(Bdirs), $(TOP)/$(dir))
+
+include $(Bpack)
+INCLUDE_LOCATIONS += $(Blocs)
+VPATH_LOCATIONS   += $(Blocs)
+
+#These are the directories in AMReX
+Pdirs   := Base AmrCore Boundary EB
+
+ifeq ($(USE_HYPRE), TRUE)
+Pdirs   += Extern/HYPRE
+endif
+
+Ppack	+= $(foreach dir, $(Pdirs), $(AMREX_HOME)/Src/$(dir)/Make.package)
+Plocs	+= $(foreach dir, $(Pdirs), $(AMREX_HOME)/Src/$(dir))
+
+include $(Ppack)
+INCLUDE_LOCATIONS += $(Plocs)
+VPATH_LOCATIONS   += $(Plocs)
+
+include $(AMREX_HOME)/Src/LinearSolvers/MLMG/Make.package
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/MLMG
+VPATH_LOCATIONS   += $(AMREX_HOME)/Src/LinearSolvers/MLMG
+
+include $(AMREX_HOME)/Src/LinearSolvers/Projections/Make.package
+INCLUDE_LOCATIONS += $(AMREX_HOME)/Src/LinearSolvers/Projections
+VPATH_LOCATIONS   += $(AMREX_HOME)/Src/LinearSolvers/Projections
+
+all: $(executable)
+	$(SILENT) $(RM) AMReX_buildInfo.cpp
+	@echo SUCCESS
+
+# job_info support
+CEXE_sources += AMReX_buildInfo.cpp
+CEXE_headers += $(AMREX_HOME)/Tools/C_scripts/AMReX_buildInfo.H
+INCLUDE_LOCATIONS +=  $(AMREX_HOME)/Tools/C_scripts
+
+AMReX_buildInfo.cpp:
+	$(AMREX_HOME)/Tools/C_scripts/makebuildinfo_C.py \
+          --amrex_home "$(AMREX_HOME)" \
+          --COMP "$(COMP)" --COMP_VERSION "$(COMP_VERSION)" \
+          --CXX_comp_name "$(CXX)" --CXX_flags "$(CXXFLAGS) $(CPPFLAGS) $(includes)" \
+          --F_comp_name "$(F90)" --F_flags "$(F90FLAGS)" \
+          --link_flags "$(LDFLAGS)" --libraries "$(libraries)" \
+          --GIT "$(TOP) $(AMREX_HOME)"
+
+vpath %.c   . $(VPATH_LOCATIONS)
+vpath %.cpp . $(VPATH_LOCATIONS)
+vpath %.h   . $(VPATH_LOCATIONS)
+vpath %.H   . $(VPATH_LOCATIONS)
+vpath %.F   . $(VPATH_LOCATIONS)
+vpath %.f90 . $(VPATH_LOCATIONS)
+vpath %.f   . $(VPATH_LOCATIONS)
+vpath %.fi  . $(VPATH_LOCATIONS)
+
+include $(AMREX_HOME)/Tools/GNUMake/Make.rules
+
+clean::
+	$(SILENT) $(RM) AMReX_buildInfo.cpp
diff --git a/mfix_tracker b/mfix_tracker
deleted file mode 100644
index b79f480348..0000000000
--- a/mfix_tracker
+++ /dev/null
@@ -1,2 +0,0 @@
-Currently up to date with mfix commit
-4b2ceb40dae466a0b07dc3c278baf9f93987bde7
diff --git a/src/setup/set_ppe_bcs.f90 b/src/setup/set_ppe_bcs.f90
index 2f58a28a3c..1b8f3325a8 100644
--- a/src/setup/set_ppe_bcs.f90
+++ b/src/setup/set_ppe_bcs.f90
@@ -12,7 +12,7 @@ subroutine set_ppe_bcs ( bc_lo, bc_hi, domlo, domhi, ng,  &
 
       use amrex_fort_module, only: ar => amrex_real
       use iso_c_binding ,    only: c_int
-      use param,             only: zero, half, one
+      use param,             only: half
 
       use amrex_lo_bctypes_module
       use bc
diff --git a/submods/amrex b/submods/amrex
new file mode 160000
index 0000000000..93fb085d28
--- /dev/null
+++ b/submods/amrex
@@ -0,0 +1 @@
+Subproject commit 93fb085d28349cab33892726dfa3107a85a7719e