Successfully converted existing code to structs and interfaces