INIT-START-1

- move certain actions around in order to create clean start up script