Major functionalities implemented, minor update