huge update, but not working yet. Only update for dev. Several components changed