Infrastructure Upgrade

Simplify your framework while still retaining maximum functionality.