Font rendering is now working, some re-organization.