Finishing up standalone code