Basic structure is now in place

All annotations are complete