Finished basic minimum functionalities