Updated to new API.
Framework done.
Kinda sorta progress.