Porting over remainder of content
Added assertions