Progress update, I'm hoping to have this ready by Wednesday at the latest