added function modules and UI
swapped out bundles