Progress update, lots of stuff check util.php for TODO