Added some features, rendering is not yet working