Added alot more classes