Josh's branch of hal-browser