Everything working! Need to work on button coloring and disabling/enabling.
merged