started removing statics to allow for more customizations