starting to look like something and this might be the prettiest code ive ever written
Merge branch 'joel'