some updates and migrations to the new interfaces and things I created...