Added test system button, but no functionality yet. Some misc stuff as well.