First initial commt. Move out code from Stay-Alive