Initial commit with existing utility functions