Framework mostly done