A good little bit of fixin
Less broken than my last commit