Some more stuff!! THIS COMMIT MSG SUCKS!