major content addition and some functionality