Major rewrite to enable tracking - which mostly seems