Switch back to using frameworks now that it works