getting stableish, testing on server now