Finishing Touches

Everything should be done