Clean up to functionality. Needs better button usage.