Working towards universal loading structure, been playing around with things, all stable now