36th Commit

Everything but Device Progress, pretty and comments