started adding the management stuff in