Implemented more types and some basic rendering