Stuff changed (forgot to commit sooner so...yea)