Big changes, incomplete renderer class, more functionality to other classes