Merging in two new features

Love to get feedback on my code!