7.23 Update (Incomplete)

Added in main function and headers