cleaned up merge, looks solid