Basic senate logic. Also refactored a bit