Standalone now fully working