Basic funtionality was added.