merge fix
refactored, re-organized, and improved
prod build