Finished up on local stuff - all works nicely