Fixed some older code, still needs a little more work though, also searching works but only by school right now