initial stuff
fixed merge confilict?