Cleaned up framework and frontend, icnluding integration