updated to semi-working version

Updated it to the semi-working, still need to fix the stop/quit buttons