OST Final Project Rebuild