WIP: Fixed tags
Closes #126 by ordering the members corectly
Test #126, this was one hell of a bug...
Made tests pass after the #126 fallout