migrated in some more of my code