Looks really great!

Just about to do both of those myself.