#30 and resolving some previous strange merges