Fully working with majority of generic style in place