Block structure finished - many changes left