First patch to pick up a few features i needed