Added Basic stuff

To be replaced