account and np working
Fix hopefully everything