Cleaning up, began support for launcher and bass
Helps if i update the launcher itself...