gone and leaving
fixed merge conflicts, testing
couple bugs left