Major rewrite possibly, probably soon!