Cleaned up past commit to actually work